Merge branch '1.3.x' into hotfixes