Merge "[Hoststubgen] Allow to apply policy based on inheritance" into main