#5448 Fix import of hybrids due to merge conflicts