Merge "[HSG] Allow class directive without policy" into main