GA and test for field locking
Merge branch 'Saumya' of github.com:SaumyaS/HDS-origin into Saumya