(cherry-picked from 38a669735d08bcbd28cfb0d77eee82c67aa89eeb)

Refs 0705be475092aede1eddae01319ec931fb9c65fc
Refs gh-2287
Closes gh-2362