Incorporate the late changes into sample_assistant.yaml