Imported Upstream version 2.7.5.2+repack (redone)