Add DEFERRED
replacement mode
#1751
+12
−0
Merged
DEFERRED
replacement mode
#1751