Merge branch 'bug-1218' into release