base creation for marksman, it won't work yet
Merge branch 'master' into 6.0-hunter
interediate MM changes
certified Marksman for 6.x