Remote lib SPR NNI and LGT fixed
Merging SPR LGT and NNI hotfix