aofs-12 #585 (aofs-12)