Merge "Secretkeeper: add message encryption" into main