refs 5885 modified exinfo, extext
Merge remote-tracking branch 'origin/master' into issue6105