Merge "fix NPE in CSW#oCC when the ServiceInterface is cleared out" into main