aofs-10 #544 (aofs-10)