rbs equip and workunit bugfixes
after merge