Implement #1903
Updated CHANGELOG
Fix #2096
Merge branch '1.3.0' into all-fixes