🤖 Pick PR #60157 (fix automatic type acquisition) into release-5.6 (#…

🤖 Pick PR #60157 (fix automatic type acquisition) into release-5.6 (#… #422