second commit from Eclipse Orionhub