aofs-12 #607 (aofs-12)