WELD-1536 Cross-BDA resolution should not be transitive
Use more meaningful name
WELD-1057 minor fix