Resolve #3570990 "Refine the base"

alejandro cabarcosrequested to merge
issue/artisan-3570990:3570990-refine-the-base into 2.x

Closes #3570990

Merge request reports