aofs-07 #613 (aofs-07)