PB-752 #comment crash fix after device restart + test fixes.
Merge remote-tracking branch 'origin/feature/PB-752' into dev