Merge "Preparation for minor version upgrade" into devel/master