Merge remote-tracking branch 'kwolf/block-stable' into staging