Close version
Merge branch 'release/2.1.05' into develop