Merge remote-tracking branch 'origin/dev' into fix/gpt-apply-patch-rebased