Improvements (move these back to 2.3)
Merge branch 'refs/heads/3.0/develop' into AIWS/production