CBM-enhanced construction workers for public works

Addresses issue #2316