aofs-08 #539 (aofs-08)