Merge branch 'MOBILE-439' into MOBILE-441
Merge branch 'MOBILE-441' into release_candidate