Fixed issues MIFOSX-1144,MIFOSX-1073,,MIFOSX-1072,MIFOSX-1022