Merge "Update string Lock private space automatically" into main