Merge commit 'e707672'