Fix for mobile application
Merge commit '3bbe4b06166e4dbdb3867dcb7c505b18eaa233fb'