integration 5a-5b added, not tested
Merge branch 'master' of https://github.com/jalau/GRP22_18649