Clean up the row input view
Clean up language stuff in streams UI
Merge branch 'refs/heads/2.3/develop' into 3.0/develop