Merge pull request #3003 from obrignoni/2.3/develop

2.3/develop