aofs-08 #536 (aofs-08)