sync with gradle template
unified keystore access
unified keystore access