Fixes #1398 (cherry picked from commit 06efc3b25c5af51f42448af27a269ee459d9093d) # Conflicts: # CHANGELOG.md