Adding fixes from 13492 back into Product Matrix html