Merge pull request #4036 from Wikia/intmaps

Intmaps fixes before release