STATE_CREDIT implementation
exclude unnecessary declarations when omitting user resolution fallback
Merge branch 'master' into kif-pos