- merged in changes for ORTC-lib