Update for v6.3~svn680-2