aofs-11 #379 (aofs-11)