Merge "[Secretkeeper] Add maintenance methods" into main