aofs-07 #349 (aofs-07)