[PR] Merge changes to inc/builder/ files from upstream - Make 1.0.10