Merge "Quick affordance list (2/3)" into main