Merge "Add bundle validations on request/response and state params." into main