Merge "Fix attribute mismatch in NSMF,NSSMF & OOF"