Merge "Fix issues in AN NSSMF - Allocate workflow"