Merge "Follow "atomic" to "group" refactoring."