[Tutti-commits] 26/26: merge 6376 to develop