aofs-08 #360 (aofs-08)