TABDEV-1684: Updated to implement the undocumented methods.