aofs-07 #551 (aofs-07)