Merge devel into release-6.1