[master] Friday tests patches