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