Merge "Try fixing the build again" into klp-dev