[Delivers #84025998] from public git