Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'mainstream/master' into blue_13_04_acu81679_resolve_conflicts