Merge commit '905172d75c9cfd93c757b09fa4b8afa0e926a13c' into release/2.4