This is a separate and direct commit to quarterly as PORTREVISIONs may not match from main. PR: 262853, 262940, 262877 Approved by: fluffy (mentor)