Merge "Further fix for Zen Policy inheritance" into main