Changes to make mint work like local-dev build (1.7-SNAPSHOT) but NLA-lookup still broken
various changes -- now in a broken state