Spring 6

Merged Eze Macías requested to merge spring-6 into master