UPD for merge v025