Merge branch 'develop' into release/v1.10.5
bump v1.10.5
Merge branch 'release/v1.10.5'