aofs-10 #423 (aofs-10)