History 00174-fix-for-usr-move.patch