Merge "Consolidate duplicated unseen change logic and fix inconsistent code"