aofs-11 #591 (aofs-11)