Merge pull request #1379 from gpazo/22634