Add r6 to quality list
Merge remote-tracking branch 'upstream/develop'