am 4efbf95d: Merge "Use proper variable typing"

* commit '4efbf95d8c88a3a203d687d9048b51e256ef3641':
  Use proper variable typing