Merge branch 'main' into gabrielmusat/simplification

# Conflicts:
#	src/execution_plans/stage.rs
#	src/flight_service/do_get.rs

Author: gabotechs