Merge pull request #3012 from obrignoni/2.3/develop

2.3 Progress