aofs-08 #582 (aofs-08)