generate object url always with context from object
Merge branch 'refs/heads/master' into 2.1