https://jira.opensource.anotheria.net/browse/MSK-109