Need to sync merge from master to ibm and then expand the new docs to cover the IBM-specific functions (then publish on readthedocs)