PR #1415 policy persistence: incorporate review comments