additional changes
merged with upstream
Merge remote-tracking branch 'origin/bf6' into bf6