master: Edt: changed to current