Merge "Turn debugging off prior to ship." into klp-dev