I'm really hoping they fix it because it makes me very uncomfortable. They also need to give us an option to refuse Halsin joining our camp at the end of act 2. If the player doesnt want him there, it shouldn't be forced on us. It takes away our agency. He's the only companion you can't refuse and I dunno why.
