Merge remote-tracking branch 'origin/dave-f-3' into towards-release-02