It has been done in our branch which will probably get merged to `dev` after current sprint:
https://github.com/Wikia/app/pull/1959/files#diff-bede951fb0e48db15998e5e466d5b2ceL1438
https://github.com/Wikia/app/pull/1959/files#diff-55f4318452466728372afe5edb2b0d5bR108