11213
fds
symbols,consts,define,fvary
same as above
merged
fixed some merge conflicts