aofs-08 #355 (aofs-08)