Merge branch 'master' into kq_devices