Merge "Revert the configKey generation algorithm to what it was in K." into lmp-dev