Merge "Decrease transition weight." into nyc-dev