Merge "Add monkey protection to editUrl"