block: backport

Change-Id: I9dbbd1f55caa3bb2a011e60dc2f3d172e69ecca2