aofs-08 #545 (aofs-08)