8.0 'base' (onesteinbv)

Port 'base' modification realized by OneStein BV. (branch onesteinbv:8.0-os)


There was a new pull request merge 5 hours ago #111, which still needs to be backported.