Initial D605 merge