aofs-07 #545 (aofs-07)