Merge branch 'release/2.4.1' into chores/2.4.1-develop