Merge branch 'MDL-67264-review-squashed' of https://github.com/Chocolate-lightning...