due to: https://studio.atlassian.com/browse/STRM-1885 and https://studio.atlassian.com/browse/STRM-1886