aofs-07 #547 (aofs-07)