diag2full moved to common