aofs-08 #495 (aofs-08)