Merge branch 'release/0.5.12' into develop