am 3808b3f5: Merge "HD terminology"

* commit '3808b3f55a4970b72cec4e639a014c801e864e4e':
  HD terminology