Merge "Fix all debug directives." into klp-dev