Merging Riyafa's change with master.