aofs-07 #355 (aofs-07)