Merge branch 'release/0.5.3' into develop
Remove an unused option
Update the release number
Merge branch 'release/0.5.4'