merge with DMC changes

Keep back end in harmony with DMC