367.04 merged Adam's build and debug patches