Merge branch 'ld/p4-changes-block-size'