Merge pull request #1349 from votjakovr/feature/gp_refactoring

Pull up common functionality in inference method classes