updates from aospa-legacy