Merge "Do not clear the existing no calling states" into sc-dev