No major change, trying to cleanly sync with svn repo (5.0.0-RC2)