update
refactoring after code review
Merge remote-tracking branch 'upstream/feature-store' into feature-store
resolve merge conflicts with master