Merge "BUG-1018 Implement BackwardsCompatible BI broker data notifications"