aofs-07 #422 (aofs-07)