aofs-12 #639 (aofs-12)