Prepare Beam for refactoring of distribution handling

Joachim Wuttkerequested to merge
rx7 into develop

and trivial copy edits in CMake files

Merge request reports