[US21] Use Gallery instead of Gallery2