aofs-08 #538 (aofs-08)