Merge "Update snapshot and/or references of policy/models to latest snapshots"