aofs-07 #596 (aofs-07)