DAR-2052 | WHP fixes after performance changes