0005209: Performance-Problem due to unnecessary redirect with static-urls (cherry picked from commit 4223a3f)