merge develop branch mustella test fixes to release4.9 branch (except mobile fixes). Rev #'s: 1424357 1424836