aofs-07 #549 (aofs-07)