aofs-08 #517 (aofs-08)