8.0 delivery onesteinbv

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