Merge "Make Beam more forgiving." into jb-mr2-dev