Merge "change management cypress test"