PLA-1487 merge to r227
Merge pull request #3709 from Wikia/PLA-1487-r227_3

Pla 1487 r227 3