Merge "Fix more and more spellchecker warnings" into stable/silicon