aofs-11 #582 (aofs-11)