aofs-08 #530 (aofs-08)