Fork from svn rep 1217