See #36

Added feature test and opt-out