Fixing issue #272.
Fixing issue #273.
Missed one thing in #273.
Merge branch 'hotfix/1.5.2' into develop