aofs-07 #386 (aofs-07)