Merge "DO NOT MERGE Fix several bad function definitions." into klp-modular-dev