Adding changes from david_temp branch to develop.