Merge branch 'dev' into master - Release 2.24.0