Merge branch 'bug-1389' into release