aofs-07 #339 (aofs-07)