aofs-11 #545 (aofs-11)