ARM: 6984/1: enhance TCM robustness