merged user-fixes in