Pulled in update from ace-builds