block: backport

Change-Id: Id08d398069437e9332be04865b9855dca46bb070