aofs-08 #376 (aofs-08)