Merge pull request #1861 from gpazo/bump470