import from svn version: 1144