aofs-12 #329 (aofs-12)