Merge branches 'environmentselection', 'language' and 'local_kernel' into building