Added early language redirect to prevent loop-loop
Added additional test.
Merge remote-tracking branch 'upstream/bb-1545' into joeris-pr