CC-4856: 2.3.x-saas: Overwriting metadata doesn't take effect

-fixed