Merge/pull request to resolve tickets