Merge "Log key params wo sensitive info" into main