Add feature gates where appropriate
Merge pull request #557 from ahinz/topic/gate-off-more-features

Add feature gates where appropriate