Merge branch 'fixes' into develop
release 1.2