aofs-07 #529 (aofs-07)