Merge "Hide an old debug function." into klp-modular-dev