Merge branch 'master' into develop
Added new case.
Merge branch 'develop'
Rebuild