am 33a60e47: Merge "Set the type of a RegStorage correctly"

* commit '33a60e47278d09acfa44d92ad85b1902b57a6b5b':
  Set the type of a RegStorage correctly