MOBILE-1932
MOBILE-1846
MOBILE-1840
MOBILE-1788
Code Clean