Fixed user agent headers
Merge branch 'ftr-758' into devel
Merge branch 'devel'