Merge "doctor: fix parameter setting"