Bug fix for Menu & Receiver
Merge remote-tracking branch 'origin/master'