#2717 fixed dwr merge