Closes #1421 (cherry picked from commit f508d10ad13560d7316df8642bc93fe66c05b9a8) # Conflicts: # CHANGELOG.md