misc: Initial changes for stable/2009 branch