Merge "Studio friendly support library" into nyc-dev