aofs-07 #319 (aofs-07)