Merge jt
Not a very interesting set of changes, mostly just to make clang-tidy happy about pre-declarations in different namespaces...
Not a very interesting set of changes, mostly just to make clang-tidy happy about pre-declarations in different namespaces...