Merge branch 'develop'
Merge branch 'develop'
backmerged release 0.5.5 into develop