8.0 'procurement (dev)

Port 'procurement' modification based on OneStein BV. (branch onesteinbv:8.0-os)