Merge "Continue update of invocationStart"