Merge "Fix issue #28051399: API demos crashing on Remote service binding options" into nyc-dev