acu144426 - Improve history and termination handling