Merge "Clear policy cache during DO removal" into sc-dev