aofs-12 #524 (aofs-12)