aofs-12 #526 (aofs-12)