[Bug 309939] lang subpackage improvements