Merge "Add more flags for hardening" into main