Sync main <- stable (#468)

Co-authored-by: Alex Cohen <naftaly@users.noreply.github.com>
Co-authored-by: embrace-ci <embrace-ci@users.noreply.github.com>

Author: 3 people