https://rigado.atlassian.net/browse/ES-300 https://rigado.atlassian.net/browse/ES-301 https://rigado.atlassian.net/browse/ES-302