Additional steps preparing for metric results interfacing.
Pre merge fixes