[resolve the issue SAT-1362,SAT-1378,BEINGME-65]
[resolve the issue SAT-1377]