Merge "Add extra environment info to build output"