SI-6654 return of filterKeys is not serializable
Merge branch 'master' into SI-6654
Merge pull request #1 from sullivan-/SI-6654

Si 6654