* commit '2e0f71181792780b55826bcc562ae79951e76f1b': Merge 06942bc4 from hc-mr1. Merge 988eeeb5 from hc-mr1.