aofs-07 #384 (aofs-07)