Merge "(Automated Tests) Added more coverage to Builder" into devel/master