replace given to avoid warnings
Merge remote-tracking branch 'upstream/master'