WEBSPARK-78/WEBSPARK-136

https://asudev.jira.com/browse/WEBSPARK-78?filter=-1