2020-03-15: added support for CMK1.6x