closes https://app.clickup.com/t/25617379/PROD_SC-779, partially https://app.clickup.com/t/25617379/PROD_SC-778