Add missing utility functions.
Merge branch '123' into 127