MIFOSX-1203 and test case fix for build history 692