Merge branch 'fix/changelog-version-prefix' into develop