Fixing conflicts from cherry pick
Fixing conflicts from commit that adds the stats angular app
small fix to the 'request' event