Imported classes from branch 1.14