Merge "Fix issue #21621920: VI: need mechanism to get current request" into mnc-dev