DO NOT MERGE ANYWHERE Manually merge commit 'fd35d7c0a284' into oc-dr1-dev

BUG:64864568
tree: b4c3711306232b414f0c35e8469d7f2082a4fd62
  1. core/
  2. services/
  3. tests/