create on_metadata callback for each source instead of once on unified source
Merge branch '2.4.x' into 2.4.x-saas