fixed scenario 5a and 5b and updated issue log.
Merge branch 'master' of https://github.com/jalau/GRP22_18649