aofs-08 #430 (aofs-08)