aofs-07 #542 (aofs-07)