Merge branch 'release/0.6.5' into develop
pallo to ride conversion
Merge branch 'develop'