MYG000-270 fixed
Merge branch 'master' into MYG000-276
MYG000-279 Patch
Merge pull request #114 from Jero786/MYG000-276

MYG000-270 fixed