Update for v6.3~svn698-1