aofs-07 #608 (aofs-07)