PLA-1487  merged to release 227
Merge pull request #3697 from Wikia/PLA-1487-r227

PLA-1487  merged to release 227