aofs-08 #385 (aofs-08)