aofs-09 #544 (aofs-09)