Julio Montoya f96d30f89a Minor - partial merge with 1.11.x 6 lat temu
..
css f96d30f89a Minor - partial merge with 1.11.x 6 lat temu
img f96d30f89a Minor - partial merge with 1.11.x 6 lat temu
js f96d30f89a Minor - partial merge with 1.11.x 6 lat temu