Merge remote-tracking branch 'remotes/origin/main' into 903_revert_the_fix