BISERVER-10752 - Removing circular dependency