Merge branch 'release/2.2.4' into 2.2/develop