aofs-12 #481 (aofs-12)