aofs-07 #548 (aofs-07)