Merge "Move away from custom created attrs arrays DO NOT MERGE ANYWHERE" into nyc-dev