Merge pull request #16163 from alalek:fix_16122