Merge "Add test ensuring that BCC keys not unique ids" into sc-dev