MOBILE-1144 : [Work in progress]. Not the final solution commit to avoid
compilation error on app side.