Fixed issues MIFOSX-1198,MIFOSX-1207,MIFOSX-1215,MIFOSX-1219