Merge "Fix infinite recursive loop"