aofs-10 #524 (aofs-10)