aofs-07 #495 (aofs-07)