Merge branch 'hotfix/4085'

Close #4085
Close #4045
Add initial prototype for translatable segments
Just a little bit more cleanup
Fix unit test failure