Merge "Implement Modify Core NSSMF workflow"