Cherry-picked from !1731 (merged) on 2017-patches
2017-patches
Adds also deuteron ProbNN (@jonrob @erodrigu FYI)