DAR-3161 | MWH fixes after CR