merge branch with new wrapper base classes