GitLab Upgrade: gitlab-shell depends on heimdal which conflicts with gitlabe-ce's dependence on kerberos

When upgrading to the latest version of gitlab-ce on FreeBSD 13.1 using the FreeBSD ports, the installation of gitlab-shell fails because of it's dependency on heimdal which conflicts with the gitlab-ce dependency on kerberos. Is it the intention of GitLab to move to the use of heimdal instead of kerberos, or at the very least give the option to choose?