Merge "Changes in Modify and Deallocate Core NSSI flows"