merge fix from trunk to all branches