Pla 768

https://wikia-inc.atlassian.net/browse/PLA-768

Please merge after QA