Test if this fixes OF-2131, OF-2164, OF-2165, OF-2167

Description

None

Environment

None

Assignee

Guus der Kinderen

Reporter

Dan Caseley