aofs-12 #574 (aofs-12)