Merge remote-tracking branch 'origin/feat/mainsail' into refactor/legacy-second-signature-support

Author: alexbarnsley