Goto: Bug fixes
Merge branch 'Goto-dev' into dev

* Goto-dev:
  Goto: Bug fixes