Merge "Use consistent helper class for keystore authorization" into main