https://info-tech.atlassian.net/browse/REDS-3247
https://info-tech.atlassian.net/browse/REDS-3228