Merged from builderdetail