Merge "MR_ClusterService-replace & with &&"