Merge pull request #3003 from obrignoni/2.3/develop

2.3/develop
Merge branch '2.3/progress' into 2.3/develop
Merge pull request #3012 from obrignoni/2.3/develop

2.3 Progress
Merge branch '2.3/progress' into 2.3/develop
Merge branch '2.3/progress' into 2.3/develop