Closes https://app.clickup.com/t/2m2a0ub https://app.clickup.com/t/2m2af08 https://app.clickup.com/t/2m2afed