GEP-51 Initial commit