Merge "changed builder generator"