Added build enviroment variable overide
fixed merge issues