Resolve HH-2 ".1.x"

Merged 晏 均 requested to merge HH-2.1.x into 2.1.x

Closes HH-2

Merge request reports