Merge "Moving check for empty snapshots earlier." into oc-dr1-dev