Merge fixes into release-6.1