merging build phase feature into master