chore: release cherry-picks for 2.18.0 (coder#15719)

- coder#15589
- coder#15683
- coder#15671

---------

Co-authored-by: Hugo Dutka <hugo@coder.com>
Co-authored-by: Sas Swart <sas.swart.cdk@gmail.com>
Co-authored-by: Spike Curtis <spike@coder.com>
Co-authored-by: Cian Johnston <cian@coder.com>

Author: 5 people