Merge pull request #13576 from tomastigera/tomas/bp-13462-netkit-attach-v3.33