Merge "Add support of arm for doctor"