8.0 'stock' (onesteinbv)

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