Merge "Introducing LocalServicesKeeperRule" into main