Merge pull request #1906 from gpazo/24691