Merge "Remove exception and fix metric results key" into lmp-dev