aofs-12 #422 (aofs-12)