VE-908 Manual merge of Wikia changes