[TIMOB-16523] More work on the XHR replacement.