aofs-12 #337 (aofs-12)