Merge branch 'release/v2.11.4' into develop
Use gua instead of osg.
Bump version.
Merge branch 'release/v2.11.5'