EB-417 First commit