Merge branch 'release_2_2' of gitlab.rlp.net:motionbank/applications/systems-frontend into release_2_2