Merge "Update user and tenant client's Available params link"