https://jira.rax.io/browse/UXDEVOPS-609