4.3 merged code after removing NEI specific changes