Merge "Fix incorrect flagging of flow change." into main