Merge upstream/develop into feat/trae-hook-integration