Merge flag changes. - Wow, no trouble with [chan push] demonstrated.