Merge "Add monitor for ip cid change"