Merge "Add flag for Subsequent pair Settings integration" into main