Merge branch 'release/2.4.1' into 'stable'