normalize parameters properly
cleanup
Merge branch 'develop'
5.3-M3-SNAPSHOT