aofs-11 #544 (aofs-11)