aofs-12 #471 (aofs-12)