Merge branch '3870_quick_complete_cd'