aofs-11 #611 (aofs-11)