fix missing convert on update
Merge branch 'develop'