Merge "Oops, missed a default Bundle flag." into nyc-dev