merge build changes from Mathias