CANA-1302 #time 5h Worked on the new Peristent controls