iExcellence
Merge branch 'hotfix/1.4' into develop
iExcellence fix