Bug 14697: Enhance the return claims feature