Removed of hardcode default interest period and clean up
Merge branch 'release' into core-pr-3