Merge commit '2241607' into merge