[PR] Update page builder from upstream Make 1.0.8