aofs-07 #600 (aofs-07)