aofs-07 #590 (aofs-07)