Merge more build changes from airbase