Merge "Fix default scorer provisioning." into lmp-dev