Merge pull request #16919 from jaapjansma/dev-1674