Merge "Fix issue #22564918: Request is inactive" into mnc-dev