Adding changes from master.