WELD-942: last normal bugs fixed/suppressed