aofs-07 #609 (aofs-07)