aofs-12 #623 (aofs-12)