Merge "hal: Changes to enable multi-turn"