CON-1944 | WAMService code improvement
Merge pull request #5069 from Wikia/CON-1944-improvements

CON-1944 | WAMService code improvement