cloned assets from 2.3.0
strings cleanup