Merge branch 'maintenance/4.1.x' into post-4.1.1