Merge "Fix broken remote inputs" into nyc-dev