Merge from 3.6 (issue #28665).