aofs-07 #563 (aofs-07)