Merge "Some cleanup for handler invalidation" into sc-dev