Merged commit from fhemberser