QA: Merge develop

ping @reorder please review consensus critical merge.