Bug 938472 - Modify usage of Pair / Unpair because of interface change
Merge pull request #13733 from eric30/Bug-938472

Bug 938472 - Modify usage of Pair / Unpair because of interface change