aofs-07 #637 (aofs-07)