aofs-12 #363 (aofs-12)