aofs-07 #568 (aofs-07)