[3.8] Fix #1578 source field validation