Fix done wo

Merged Javier Vescio requested to merge fix_done_wo into 12.0

Merge request reports