Merge remote-tracking branch 'origin/bkchr-collator-fix-not-sending-declare-message' into bkchr-adder-collator-new-stuff
