Minor
Fix twig error
Make error message more useful when tracking request fails
Merge remote-tracking branch 'origin/master'