Revert default policy to int type instead of Integer to avoid NPE for
now.
Merge branch 'dev'