aofs-08 #521 (aofs-08)