Con 1137 prev

https://wikia-inc.atlassian.net/browse/CON-1137