aofs-12 #633 (aofs-12)