fix receiver id problems
Merge branch 'master' into randmapp_instant_production