Merge "Update NSMF workflow of allocate"