Merge "Make FRM cleanup only local entries"