aofs-07 #409 (aofs-07)