This merge request brings changes to:
This improves the consistency and avoids overloading the generic section as well.