added core handling for mixing in subclass contributed request options
Merge branch 'master' into develop
merged develop, rolled version