do not break if no request object available
Merge branch 'master' into 2.5