Merge commit 'v1.1.7'