Closes PR 14651