Merge branch '7.4' into 8.0

* 7.4:
  Fix extra space in inherit_data_option.rst

Author: javiereguiluz

form/inherit_data_option.rst

@@ -29,7 +29,7 @@ entities, a ``Company`` and a ``Customer``::
         private string $firstName;
         private string $lastName;
 
-        private string  $address;
+        private string $address;
         private string $zipcode;
         private string $city;
         private string $country;