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