Merge pull request #1380 from gpazo/23119