BC-2014 #resolve back to use TermManager