Merge branch 'develop' into version-13-pre-release