Merge "(Automated Tests) Increase line coverage of Builder" into devel/master