PLA-1487 merge to r226
Merge pull request #3708 from Wikia/PLA-1487-r226_3

Pla 1487 r226 3