Merge "Trying to unbreak build..." into klp-dev