Merge branch 'doctor_appoointment_end'