Merge branch 'release/2.11.4' into develop
Fixes default value for var tags
Version bump
Merge branch 'release/2.11.5'