aofs-11 #603 (aofs-11)