LPS-32523

Need a fix in DDM and Journal also