BS-7692, synchronize put operation
Merge branch 'MasterBugFixing' into 'BS-7055_CSRFImplementation'