aofs-12 #634 (aofs-12)