aofs-07 #569 (aofs-07)