add changes from feature-worker