Merge "SF: allow more than one client to use eEarly[Start|End] flags" into sc-dev