Eliminate use of gen_server:call/2.
Merged bug25838 into stable
Merged bug25838 into stable
Merge stable to default