HomeHEPForge

merged fixes from release branch