pulling aospal upstream changings

BACON!