Merge branches 'release' and 'hp-cid' into release