Fix some merge issues from 6.7-dp-9 merge