Merge branch 'ticket_upgrade' into 'project_rule'
This tag has no release notes.