Prepare for merging
(cherry picked from commit b401c26)