Kildin Sami workaround magic
simple name change
locale magic fix
Merge branch 'sjd'
Cleanup merge smells