Merged fhemberger-patch-132