Merge "Remove deprecated class StubContLang"