merge with 3.0 branch
files deleted
wmc chnaged, suggest map added