aofs-07 #629 (aofs-07)