aofs-11 #551 (aofs-11)