Merge after PRM communication #496 -- Mobile fixes 

All tests pass