Merge "Switching from Adaptable to Provider interface." into nyc-dev