Merge "Fix issue with early service start" into klp-modular-dev