aofs-08 #547 (aofs-08)