cherry pick #4560 to release 4.2.1#4565

jamsman94 merged 1 commit intokoderover:release-4.2.1koderover/zadig:release-4.2.1from

PetrusZ:revert/release_4.2.1#4560PetrusZ/zadig:revert/release_4.2.1#4560Copy head branch name to clipboard