aofs-12 #582 (aofs-12)