cherry pick of admin filter risky PR