merge from dpi branch jm