[BI-266]forced to use a tagged version due to cyclic dependency....