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