#7385 Giovannis Demostration Changes