Merge "Adding additional check for zero-sized snapshot." into oc-dr1-dev