aofs-07 #344 (aofs-07)