Merge commit 'push-into-head'