aofs-07 #582 (aofs-07)