* commit '48305f327ff3839ddbfa5a6fb42a57150a69480c': Merge 06942bc4 from hc-mr1. Merge 988eeeb5 from hc-mr1.