Merge remote-tracking branch 'stefanha/block-next' into staging