make the obt library branch compile again with all the changes merged in from backport