2020-03-15: added support for CMK1.6x 2020-07-31: added short interface names, code cleanup