Public API update 
MOBILE-1910
MOBILE-1934