aofs-11 #547 (aofs-11)