aofs-07 #306 (aofs-07)