Merge "Documentation for flex field" into nyc-dev