Merge "Deprecated the contentinfo and the number" into nyc-dev