bug fix
fixed conflicts
[#43590691] encrypted data can be changed with best_in_place