aofs-07 #509 (aofs-07)