Merge "Apex: Refactor snapshot pipeline for other types"