Merge "Better handling of confused finish transition." into nyc-dev