Merge branch 'chandan/prep-subpage-blocksize' into for-chris-4.6