Merge "add option to link only same credential configurations" into lmp-dev