Cherry-pick from legacy OG-Platform: 4b94679dfa841f557551803823dfd9d324190251