Ve 588 preview

This is to merge the bug fix to preview. 

https://wikia-inc.atlassian.net/browse/VE-588