Development to master merge.

Note. If you receive enumeration json response from server in form of integers it's the only one right way to handle it in the best way.