am 61e21940: am 7fcb5dc5: Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev

* commit '61e21940ffd643dad1aa6c7c3dc9933815aecd74':
  Pin electron beam surface to natural orientation.