aofs-12 #551 (aofs-12)