aofs-12 #407 (aofs-12)