aofs-08 #354 (aofs-08)