feat: Issue [#3388288]: Update Contact/Hours behavior fix(upgrade path): Issue [#3388023]: Require and enable y_branch