aofs-11 #558 (aofs-11)