Merge branch 'for-merge'