fixing work_zones branch error
Merge branch fix for 'work_zones'