aofs-07 #428 (aofs-07)