Merge commit 'c49b88b93bca53c04f18d78c27dbf1dc6daea909' into release/2.4