Source commit from GoogleCode: trunk/FD4