Removed unnecessary condition.
Changelog entry.
Merge branch 't/11237'