Merge "Fixed performance issues with implementation of BA-to-BI mapping"