aofs-07 #530 (aofs-07)