Merge "Fix Policy GUI Template Issue"