Added a hint for the URL's and auto_item
Merge branch '2.1' into 2.2

* 2.1:
  Added a hint for the URL's and auto_item