updates from AOSPA-Legacy