397.42 merged changes form Omco edge_diagnostic branch