Refactored snapshotters code to reduce code duplication
Merge remote-tracking branch 'origin/master'