url and warn fix
Merge branch '0008-old-warn-fix' into develop