Local debug removal
Merge with upstream
Renamed differential forms of the functions.
Resuming operation.