Merge "Use feature test rather than version check"