aofs-07 #519 (aofs-07)