Merge remote-tracking branch 'origin/bug-1239' into release