CDMT-62 fixed: --replace CLI switch implemented