Merge "Move overrides to proper place" into stable/rocky
tree: 5d34188e5486aa08bd79bc54e567f2f834c0e8e0
  1. classes/
  2. .gitmodules
  3. .gitreview