PLA-950 added Szumo's fix
PLA-950 code elegance
Merge pull request #2209 from Wikia/PLA-950-b

PLA-950: merged again