aofs-07 #592 (aofs-07)