Merge "[CPS] Rolling update and prometheus changes"