aofs-08 #558 (aofs-08)