Sponsored by: Netflix
Update per review, add missing change
Update per review and rebase over resize changes... woof.