Merge branch 'bug-1339' into release