aofs-07 #430 (aofs-07)