Test case
Merge branch '1.3.0' into all-fixes
Merge