manually merge the fixes from branch geworkbench_2_5_2