aofs-07 #459 (aofs-07)