aofs-08 #368 (aofs-08)