It seems like the root cause of this issue (a deadlock due to 2 Emacs functions waiting on different output from the same socket) was fixed as part of bug#61350.

Can the tramp-compile-disable-ssh-controlmaster-options workaround now be removed?

Some of the users in my org have complained about additional SSH connections being created by compilation functions.