Merge "Cleanup PM snapshot" into sc-dev