Merge branch 'release/unicorn-2.6.11' into develop
Fix bugs
Change version
Merge branch 'release/unicorn-2.6.12'