Merge "Bigger ownerInfo padding" into pi-dev