Removed check for current TIPP. Thought I'd done this but it's back!!
Merge branch 'refs/heads/dev' into test