Add missing wrappers
Merge branch '4.0'