aofs-07 #450 (aofs-07)