Merge branch 'zecke/ussd-side-channel'