aofs-07 #604 (aofs-07)