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