Merge pull request #392 from gavincornwell/master

MOBILE-2964, MOBILE-2975, MOBILE-2979 & MOBILE-2986