aofs-12 #477 (aofs-12)