Port DT fix for dispatchProp arg in mergeProps
#1897
Merged
dispatchProp arg in mergeProps
#1897