Updated comments on the tray class.
Merge remote-tracking branch 'origin/Experimental'