Issue #28066: Merge srcdir fix from 3.5