pushed Jeff change to fix diag test, changed build of metrics to devel branch by default for now