Synced with CKM

Signed-off-by: imcnicoll <ian@mcmi.co.uk>