Merge "Disable time consuming debugging code." into klp-dev