Merge origin/b2012 into pbranch