aofs-08 #398 (aofs-08)