DAR-1707

https://wikia-inc.atlassian.net/browse/DAR-1707