Merge "Fix FastTrack creation buffer count irregularity" into nyc-dev