Add rules support for giving xp, kxp
Merge branch 'origin/7.x-1.x'