Update kk branch for Evita custom entries.