Populate __context__ with retcode; Fixes issue #5518
Merge pull request #6378 from naiyt/develop

Populate __context__ with retcode; Fixes issue #5518