Merge "Tag Stor4NFV for Fraser 6.0"