aofs-07 #583 (aofs-07)