aofs-07 #283 (aofs-07)