Resolve-21517

Resolve-21517