am 49c0d471: Merge "Fix all debug directives." into klp-dev

* commit '49c0d471a8ba9ed32e7fdadb7e4ea6118b4b4af4':
  Fix all debug directives.