Fix Builder adding requiring code to setUp code
Merge branch 'Feature_Fix_Builder_Adding_Requiring_Code_To_SetUp_Code' into develop
Merge branch 'develop'