Post-merge bug fix: lock_type is a enumeration type and not a bit mask.
Attach a file by drag & drop or click to upload
