Merge "NONRTRIC-955: Fix unit test 404 issue"