manual merge of work_srozen