Upmerge changes from branch stable7 into master.