AE-2578 | BATrace