am a3d40d5f: Merge "Fix some reflection errors"

* commit 'a3d40d5f764adfde8fa40d826cd93ba36cd15437':
  Fix some reflection errors