Changed order and edit_upstream dependency