aofs-08 #590 (aofs-08)