Merged in feature/loader-registration-cleanup (pull request #62)
develop
2020-02-25, Gary Kramlich