EoD 5/20 commit