Merge "Whitelists ephemeral actions for P" into pi-dev