aofs-07 #543 (aofs-07)