Merge remote branch 'crater/master' into kq_devices