CKM TRUNK Sync

Signed-off-by: Ian McNicoll <ian.mcnicoll@oceaninformatics.com>