Merge "Revert "Revert "Handle case when snapshot dimensions don't match""" into oc-dev