aofs-07 #394 (aofs-07)