Merge "Improvements to external call handling." into nyc-dev