Merge pull request #1874 from Yopli2k/BaseWidget #26

Job	Run time
Mexico (MEX) - mysql 8.0	1m 58s
Guatemala (GTM) - mysql 8.0	1m 58s
Colombia (COL) - mysql 8.0	2m 52s
Ecuador (ECU) - mysql 8.0	1m 59s
Dominican Republic (DOM) - mysql 8.0	1m 55s
	10m 42s

Provide feedback