merge from 'generic texture improvements' contains generic barrels and forklift re-texture jobs too