(master) initial import starting with 1.0b3