block: backport

Change-Id: Ic25c8ceacd36a3d787b025617df69359cb78d378