BISERVER-10752 - Removing circular dependency
Merge pull request #1189 from rmansoor/master

BISERVER-10752 - Removing circular dependency