BAC-486: merge 1.19.7 changes
Merge pull request #1015 from Wikia/1.19.7

BAC-486: merge 1.19.7 changes