cloned assets from 2.3.0
Merge branch 'master' into pro-2.3
strings cleanup
Merge branch 'master' into pro-2.3