What this PR does: Which issue(s) this PR fixes: Fixes # Checklist CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX], [DEPENDENCY]
