Merge "Use exactly the same timings for the ElectronBeam as JB." into jb-mr1-dev