Merge "Fix issues in AN NSSMF for allocate &modify flow"