Merge "ClusterSingletonService cleaning FRM/FRS"