Merge "Update PM documentation for Keystore" into main