MOBILE-2374
MOBILE-2390
Merge pull request #194 from jmpascal/1.4-Dev

Bug Fix