Merge remote-tracking branch 'origin/ao-more-resilient-subsystems-av-store' into bkchr-adder-collator