Fixing properties
Merge commit '640fc6470aba7c611c9f967f33cbc7dddd8eeb4d' into ios

* commit '640fc6470aba7c611c9f967f33cbc7dddd8eeb4d':