aofs-07 #328 (aofs-07)