Merge "Attempt to fix missing clock bug" into klp-dev