page-size branch rebased onto master