Merge "Pin electron beam surface to natural orientation." into jb-mr1.1-dev