Merge "Fix for testManagedCall" into pie-cts-dev